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

Change-Id: Ic2f746b752ed9cf03cedef77fccc267d718ef352