Bug: 135768100 Test: boot Change-Id: I7f8b5d07d4937804e8b0838936f8984ca7d08efa (cherry picked from commit 7b152971)