Bug: 169965769 Test: Built, flashed and booted a device. Change-Id: I1f5b1b989e8c2b78e0d575450cc893bdf6e4e003
a12b964839