Merge cherrypicks of ['googleplex-android-review.googlesource.com/25235371'] into udc-qpr1-release.

Change-Id: Iac6c8393cf3e0cef96b6c38d5c78c0f864feeafc
tree: d481005bce2881d7b1f46d5d7d7af25aa4016fd7
  1. stats/
  2. OWNERS