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

Change-Id: I874de1d8668ea0df50d0c84357469e719841c4f8