Adapt to new AOSPA vendor