Merge cherrypicks of [3120219, 3121602, 3124243, 3125180] into oc-mr1-release

Change-Id: Idb4be19cae4a309ea39e4ad3f49146b7c806184a