d851: modify for AOSPA