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

Change-Id: Id2caae5d5f1f0e714ed9b65d87939d2a2eba5109