Merge "Fix statsd logging in BatteryStats (nesting prob.)" into pi-dev
tree: 426915909d51ff454a9699cf8e867495b9351d9a
  1. atom_field_options.proto
  2. atoms.proto