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

Change-Id: I7f29a28fd55af6e2d2d2a45cb8002df597ac0396