Merge "Merge "statsd: fix double close." am: 0b8f17b3ba am: 6547dad5ac am: 86b0140271"