N7100: updates for AOSPA