This reverts commit 1c28b9b29f. Bug: 204332282 Test: presubmit P27107402 boots fine on my device. Signed-off-by: Jing Wang <jwangh@google.com> Change-Id: Iea0e1a5eeff048659721981de0e81045a8dfa5f2
1c28b9b29f