Merge cherrypicks of [2434738] into oc-release

Change-Id: I60df7ecf39761e2c67ecf15645eb93b609e052b3