[automerger skipped] Merge "Log the thermal throttling event to enable conditional temperature pulling." into pi-dev am: e905bdb194
am: be78d98998  -s ours

Change-Id: I2db804488e00a6fb2551449fc0508d2c318de0d3
tree: bb29b2ee7a7680ce4406d9775daa135e5c9aa7e3
  1. atom_field_options.proto
  2. atoms.proto