Merge cherrypicks of [3509910] into oc-mr1-release

Change-Id: Id1d5683a00a88832ec7bf746fa7bb918a8d7579c