2a8c2c3601
Bug: 215434166 Test: build, flash, device boot to home. Merged-In: I44653ab7be117cf08cb3b8d3086ad76b43bf15e1 Change-Id: I44653ab7be117cf08cb3b8d3086ad76b43bf15e1