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