merge from AOSPA-legacy