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

Change-Id: I52340c790fe638c0baf8d48e5880b1e8ac8e408f