This reverts commit 30bb1d09. Reason for revert: b/191191441 Bug: 171506470 Bug: 191191441 Change-Id: I698709a27f3b09e5e02143efd7a71157b5ecf75a