AOSPA-legacy-ify