Merge cherrypicks of [3654171] into oc-m5-release

Change-Id: I175b50cba5eb73028ec205f4ca9abacef63fcd80