This reverts commit 8ca02bbeb5. Causes boot loop on bullhead. (cherry picked from commit 28dbcaa23b) Bug: 63245673 Bug: 65660058 Test: m Merged-In: Ife5f83ebf56fb956e5015d2797b5b47a515ec171 Change-Id: Ife5f83ebf56fb956e5015d2797b5b47a515ec171
8ca02bbeb5
28dbcaa23b
0673412bb9
357876455c
5f7ed2dd60