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