[automerger skipped] Merge "Fix statsd ASAN failure" am: 12140677ea -s ours am: e8460d61e5 -s ours am: 1f2ddd8b7f -s ours am: a6189b7d4a -s ours
am: 988a8a8a5b -s ours
am skip reason: change_id I5db561c4223efc4ef6b1441490d319cc6ec8afc7 with SHA1 d39437888c is in history

Change-Id: I0c80b26824f3e7819f3bae2b7a0b8505e0df63f5