Merge "Includes annotations with statsd reports." into pi-dev
am: b61f80b42b

Change-Id: I0ec92b7e372617a4f45cf2ed22fbbe6b5ced8cbd