am 22d5d7b6: Merge "Fix state synchronization problem." into ics-mr1

* commit '22d5d7b6e865e36eb3e057bc27d339d56c292d20':
  Fix state synchronization problem.