pulling changes from AOSPA