Bug: 148912739 Test: make Change-Id: I9be4caeda8f50645bc742e95bfd7ba067a02883f Merged-In: I9be4caeda8f50645bc742e95bfd7ba067a02883f (cherry picked from commit b78e84c5)