aml_sta_331711010
Snap for 9696069 from d73b4aa2f9782e8151d31593576592d8da0da570 to mainline-os-statsd-release

Change-Id: I3f93fdcb28d79102c966132c6b8696940b317576