aospa: inital commit