[automerger skipped] Merge "allow statsd pull based on event trigger." am: bd4ae82f am: 161b7028 am: 49dd4c02 -s ours Change-Id: I46157c0d6f0debc62f3afc3af1992359376aa225