AOSPA: Initial commit