Merge cherrypicks of [2489285, 2489286, 2489323, 2489399, 2489257, 2489326] into oc-release

Change-Id: Ibabadcf24c9f2730ed23c37487f82d5359c88df9