Merge cherrypicks of [2986363] into oc-r3-release

Change-Id: Ibb33effd2646763a31ceb8495c0743c928444809