am 4e8a3bcf: am 3eba934a: Merge "Clean up USAGE_SHARED and add syncing for USAGE_SHARED." into jb-mr2-dev

* commit '4e8a3bcf03cdaeba6ea2f7cbbbb55c7b10c19e9c':
  Clean up USAGE_SHARED and add syncing for USAGE_SHARED.