Merge with aospa-legacy