Bug: 200629485 Test: make Change-Id: I4c6ab1febcf12c6a7e2ab3364bb720e81c58dae7 Merged-In: I4c6ab1febcf12c6a7e2ab3364bb720e81c58dae7 (cherry picked from commit 84b8cd11)