[coastguard skipped] Merge sparse cherrypicks from sparse-9831173-L91500000959593737 into mainline-adservices-release.

COASTGUARD_SKIP: I5f5843b533487d615592ecdc34c2c9fe1de7242c
COASTGUARD_SKIP: I6c3a04894458a0552cd01498934ef4f89bcb4d5d

Change-Id: If60de0c88c14565d047fd30fc3603c0178cd3ae4
tree: 6f250d8d567e730f28156dd47d9356c559a82754
  1. stats/
  2. OWNERS