Bug: 130451254 Test: make Change-Id: Ifd66f9e53dd86d21fe66e4617cc4b209fecd7328 (cherry picked from commit 904c429b99)
904c429b99