Merge cherrypicks of [2727320, 2726842, 2727087, 2727088, 2725713, 2725714, 2725715, 2725716, 2725717, 2725718, 2726843, 2726844, 2727287, 2725719] into oc-r2-release

Change-Id: I08dcd180a1920dff1c52dae026b5f72db7d346ca