Merge "ConditionManager: don't crash when trying to add unexpected condition"
am: 46f7199cb1

Change-Id: Ifd9394c6da48a88ddb6f59ead3db1c93519a70ac