Initial AOSPA+

Change-Id: I032716577f9b7c60baf93ea3c5151f2ca79904bf