Merge cherrypicks of [3072906] into oc-release

Change-Id: I32c3e3095026fe9e0bc57922ecdc5f26c39587a0