am 2fc87a73: Merge "Clean up stats stubs." into gb-ub-photos-denali

* commit '2fc87a7338d34d8d7383eeea3a367893961a6ac5':
  Clean up stats stubs.