Merge cherrypicks of [6868531] into oc-mr1-1.5-iot-release

Change-Id: Id1e1cdba4f3a3e341afa78a3658709d75fb3b606