This reverts commit 7e8c82cd. Reason for revert: Causes lots of test failure Bug: 163971610 Change-Id: I8529e451a7b5310ce0f6beb9d5b37e82701c61e1