Merge "[AWARE] Remove enableUsage/disableUsage API"
am: 647f2e1493

Change-Id: Ic48804f3e2ecac6a817d261f9f9cbfc505b01716