Bug: 181638132 Test: make Change-Id: I84a439866f69a66339a6b318757850f7e111ef5d (cherry picked from commit 1a27741b)