Merge cherrypicks of [6868916, 6869104, 6868530] into oc-mr1-1.7-iot-release

Change-Id: Ia2af420fcd4e1aafda576b05fe57a57db339ecc5