Merge cherrypicks of [2986362] into oc-release

Change-Id: Ieb07b20c6e8b0558dd7cf0a37aad58c2a19010e7