Merge cherrypicks of [3484108, 3483651] into oc-m2-release

Change-Id: Ied8deb31e77aadd4512fe896863f854566299434