Initial AOSPA+

Change-Id: I2391c60b76b12b0acf55f0ff6c148df2bca40e13