merge from AOSPA-legacy

merge from AOSPA-legacy