Bug: 287069860 Test: m && flashall && end-to-end developer testing Change-Id: I86173ecaf9900f5c869847106166f07e482e6a74