am 0c0fcce6: Merge "Add Configuration changes to UsageStats" into lmp-dev

* commit '0c0fcce6a5ce39df0161a78fbb0577d4c70a7a87':
  Add Configuration changes to UsageStats