Revert "import from AOSPA"

This reverts commit 3c0fe8dcfa0e89e0d471a6cd4398f3ee8129a1ba.