more AOSPA adaptations

Change-Id: I0301ddac716abe53f365894219a41f7a9d999f72