Merge cherrypicks of [2331583, 2331644, 2331627, 2331663, 2331664] into oc-release

Change-Id: I439afe08cdc14c0289917af2a1dafa426559e9c5