Merge cherrypicks of [3652403] into oc-m3-release

Change-Id: I38b14a18697f804277bd78c69c8a4b1749c71d4d