Revert a4972536 Bug: 150519505 Bug: 158506052 Eldar: 157730539/ Test: m statsd (cherry picked from commit cbc5070f) Change-Id: I8c6ac9a1bfedea76da4c4d7a2e141d7c27a05225