l900: update for AOSPA