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

Change-Id: Iced4f4997d04834ac26cfbba5ec292c6f8ebbe50