Merge "Refactor SensorStats. b/17838681" into lmp-mr1-dev