Merge cherrypicks of [2372722, 2371265, 2372622, 2371944, 2372723, 2372703, 2372623, 2372224, 2371266, 2371945] into oc-release

Change-Id: Ieda3b450637699bfb36e2e9c7957f08ffc572805