Merge cherrypicks of ['googleplex-android-review.googlesource.com/35468342', 'googleplex-android-review.googlesource.com/35833509'] into 25Q4-release.

Change-Id: I64d9802f1701f548fe6014932155e072d8c45582
tree: 8eaa88315b71eb90beaa04fc82e1de1c1d92b2f9
  1. stats/
  2. OWNERS