Merge "[AWARE] Remove enableUsage/disableUsage API" am: 647f2e1493 am: 8e32c1b718
am: 313b7c3613

Change-Id: I4382b1f5e25a15a96a1bca7e1492d3d1791c093e