Pull major changes from AOSPA-legacy

pulling changes from legacy repos