This reverts commit 7fa00380. Reason for revert: b/158054788 Bug:158054788 Change-Id: If2ef8b4499eea69e7e5f862a851da5414af067ea