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

Change-Id: I4702d65237c4a56b1f2cad2bf5e3505f1cd4ecfc