Merge "[AWARE] Remove enableUsage/disableUsage API"