Merge cherrypicks of [2945579] into oc-release

Change-Id: I9c8a562023420f234f06ae8a1825351016e7f311