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

Change-Id: I69001477d02c612540ff74385400551293f7c600