Bug: 120873123 Test: build, flash, and test manually Change-Id: Ibd7a47cb814fe16ecb1c017865ab28862e17ddcc