Merge changes I6de5ac05,I5f8c112d into oc-mr1-dev

* changes:
  Fix system restart due to race in TSMS
  Remove redundant synchonized blocks from TSMS