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

Change-Id: I789b60319c34837f7da75bd92fd70a748a766626