Merge cherrypicks of [2455372, 2455337, 2455612, 2455497] into oc-release

Change-Id: I05e7158e88bbdba30984eac8f4ab0eaf8cb0a55c