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

Change-Id: I96f45a327004da4f476c0cb017e532c28a5b4a6d