Merge changes Ifee27c86,I9ffa4b00

* changes:
  Add more atoms to statsd
  Add wakelock atom to statsd