This reverts commit fd54fc34c6. Reason for revert: b/215275738 Change-Id: I93612df6493a2a4184a98b3f049e23aa888095f2
fd54fc34c6