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

Change-Id: I97f951a53f7d0466be48c521a58ac77b3616145a