Merge "[AWARE] Update capabilties" am: 10569b1bb4 am: dbaff93416
am: 95e7e5a098

Change-Id: I6022b5763984280d148804d0364bd4cf89bf45f6