Merge cherrypicks of [2297119, 2297050, 2297018, 2297140] into oc-release

Change-Id: I5c8d8d5ad86d3d7647354fc252c946ef536bedcc