Bug: 120220144 Test: build, flash, and test manually Change-Id: I913d93c2f41e5ffea1d0b9c00d519eba327a0832