Merge changes I76457a6f,I35c8a9c6

* changes:
  Add logic to use system server UID for noteOp call
  Catch exception when using noteOp in Context Hub Service