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