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

Change-Id: Ie2ffaf2b1f80b803134226aa0f884367caf218ef