Revert "AOSPA fixes"

This reverts commit 17d12e834479d72c835201286b9fca744b0eb1a2.
wrong branch
Revert "AOSPA project"

This reverts commit d812adfce71a8b9955ebbff2d84612eebcfb02da.
wrong branch