Merge cherrypicks of [2676137, 2676468] into oc-release

Change-Id: I8f5c0ac68908bf969727cb0d7d683868a546355c