Merge "Set correct flag when enabling listener for conditions." into nyc-mr1-dev am: dccd2544b3
am: 9c967df320
am: 503a155438
Change-Id: I7a5b4efda0b9d58b5ac9a3645a9abb526293c10f
This commit is contained in: