Merge \"Refresh state after loading conditions from xml.\" into nyc-mr1-dev
am: 58e217b180

Change-Id: I56d396108b46aba406ebf9d490c749bbb3e90c5a