Merge "[AWARE] Update API per review" am: 9e4f111e0f am: ce7f932be7
am: 86cd994a15

Change-Id: Iecf2458a037431114a8b9e0063524d2093fa13fc