Merge cherrypicks of ['googleplex-android-review.googlesource.com/25546839'] into mainline-extservices-release.

Change-Id: I0d4565e79232627ec8c83e3fa57d35b3f580d389
tree: 73c76e2514acd614e7c3cfeceb1fb09de68ddc46
  1. stats/
  2. OWNERS