Bug: 140833849 Test: boot & run normally Test: m checkbuild Change-Id: Ifb3e4a69073380e09348572fdd7b0e5386e00525