Merge cherrypicks of [3215323, 3214370, 3207446] into oc-mr1-release

Change-Id: I099a71320b55163a9f2bc9088b3c5f3bdac55208