Merge cherrypicks of [2550323, 2550336] into oc-release

Change-Id: I798c16a354a33f39c5f98ef4637d9bc1072bda77