Merge AOSPA-legacy Changes