Merge "[AWARE] Update capabilties"
am: 10569b1bb4

Change-Id: Ica1d8beff6fd7063751cc9b22c841038a2cfa510