Bug: 120236748 Test: build, flash, and test manually Change-Id: I96042f51ce3fe32d15596b026f802f89dabf8405