Merge cherrypicks of [3072909] into oc-r2-release

Change-Id: Ia5de5212789189548193af6d8e7571e6a9ee62f5