This reverts commit cbb9f05e5a. Reason for revert: <AoC is reverted by b/222138584> Change-Id: I4125a61c1142e0c6733f121b227d9ec652191a4b
cbb9f05e5a