AOSPA-Legacy-ify