Change to support new AOSPA