Merge "Fix state synchronization problem." into ics-mr1