Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev

* changes:
  RESTRICT AUTOMERGE Fix unable to send file via OPP
  RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases