Bug: 134674484 Test: build, flash, and test manually Change-Id: I86879e034b6605a4d3db2024f5e27601a45580fd