Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev