Merge cherrypicks of [2524909, 2524910, 2525349, 2525350] into oc-release

Change-Id: I43c99e7c433af7a8b08fa63ecd934bd3b007cdce