changes for aospxs vendor bringup