bug:37988580 Test: build (cherry picked from commit f9776919) Change-Id: If52e569b6403a8b3f2e31d472b6d11ab42d13763