Major changes to manifest pulled from AOSPA-legacy and locally changed