[coastguard skipped] Merge sparse cherrypicks from sparse-11068824-L29100030000213974 into mainline-os-statsd-release.

COASTGUARD_SKIP: Iab1f593f228749cafa5521839889a86583964ee2
COASTGUARD_SKIP: Ieadcd9f77ce4615fcbc4aa1aebc6dfa49db651e6

Change-Id: Icdd82cbc1e194608a14434f1add40510a6ba63d9