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

Change-Id: Ieb85c3d19bd579246b924b44f5f2ebe6af8dad34