Merge from aospa-legacy