Bug: 119305624 Test: normal/recovery boot aosp_taimen Change-Id: I15aa275fa658b58f5a5d3e651d164f9fcd87c0af