Bug: 175430552 Test: build, flash, watch logcat Change-Id: If441946fa278c04ae88122f6243f5a7dedd96ebc (cherry picked from commit bd27c365)