Merge cherrypicks of ['googleplex-android-review.googlesource.com/22381802'] into sparse-9831173-L91500000959593737.
SPARSE_CHANGE: I5f5843b533487d615592ecdc34c2c9fe1de7242c

Change-Id: I6c3a04894458a0552cd01498934ef4f89bcb4d5d
tree: 2d0b5a882a2b016f8716e913a65392f861e03958
  1. stats/
  2. OWNERS