This reverts commit 9cc703de.

Bug: 68114567
Bug: 73290041
Bug: 74058011
Bug: 109716861

Change-Id: Ibb62bbddf0e1d747ba8abf53e55e6e2374b2f2be
Signed-off-by: Patrick Tjin <pattjin@google.com>