Merge change 2364 into donut

* changes:
  Initial checkin for App Fuel Gauge infrastructure.