This reverts commit 07e40316. Bug: 193831720, Bug: 168093983, Bug: 156549746 Test: manual Change-Id: I86df6f9f1d672c455cd0aedc58012b3335659479 (cherry picked from commit 6d4a00b1)