This reverts commit 6f3996fc. Reason for revert: b/174070785 Change-Id: I4b5f428902439912eee6ca085fe6085f69cae8f3