Merge "ValueMetric pushed events should check condition" into pi-dev
am: 644c94f125

Change-Id: Ib8555c0664bceee108dc4f93bbeaaa9a146ef00a