[automerger skipped] Merge "Fix statsd ASAN failure"
am:12140677ea-s ours am skip reason: SHA112140677easkipped by user yikong Change-Id: I7b70255b4556c7105523c892a966ef120fac8d87
This commit is contained in:
am:12140677ea-s ours am skip reason: SHA112140677easkipped by user yikong Change-Id: I7b70255b4556c7105523c892a966ef120fac8d87