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

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