Merge "[AWARE] Fix visibility of Aware Characteristics API" am: 13c76b77dc am: 60e6734100 am: 5f9b3d834b
am: 2a9cc83dee

Change-Id: I2df8122823b811c2418f8d5e583933632fa7b818