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

Change-Id: I12fe31ca45193e61e33e1c1786b589cd24c5a6dc