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

Change-Id: I21811002b1af353b47132f8028140a59734374b1