This reverts commit 95bc8d7067. Reason for revert: Conflict with revert for b/190622577 Change-Id: I993e8da9737634d0cc815cd75b461699170602cc
95bc8d7067