Merge cherrypicks of [2624661, 2624224] into oc-release

Change-Id: I37c6e10bca102f2cea44717868c3aac4267ad02e