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

Change-Id: Ia6fde03500c402804c701105bf0ef6b192d0e0b2