am 9f692b52: am 9be305d1: Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev

* commit '9f692b520255435903c8c1efb7b50f22a80505a5':
  Make the Context service constant for UsageStats public