This reverts commit76b4b2c366. Bug: 128688902 Bug: 150032912 Test: boots (cherry-picked from commit1b14f2cc51) Merged-In: I0ae248ac2a3fe4002466cae33b231234ddaa69f2 Change-Id: I0ae248ac2a3fe4002466cae33b231234ddaa69f2
This reverts commit76b4b2c366. Bug: 128688902 Bug: 150032912 Test: boots (cherry-picked from commit1b14f2cc51) Merged-In: I0ae248ac2a3fe4002466cae33b231234ddaa69f2 Change-Id: I0ae248ac2a3fe4002466cae33b231234ddaa69f2