Merge changes from topic "resubmit_joeo_cl"

* changes:
  Fix build error.
  Revert "Revert "Start auto-generating the stats log API.""