Merge changes from `oc-mr1-iot-dev` into master. Change-Id: Ie57475c22a8548c60184a82028e622607bba5e15