aospfr/native

Change-Id: Iab7281b2bc8b274665e52a96d4a22783893e7336