Merge "Handle condition changes when metric is not active." into qt-dev
am: d0ffaeb4b5

Change-Id: I9bdcd3610d8600cafd8f5fcb2cfec7709fd2fc91