Merge changes from topic "statsd_socket_review" into pi-dev
am: 46fca44ee5

Change-Id: Iae06193a18ad48a664904dbd5bc26c5b4c7ae45f