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