Merge cherrypicks of [2419995, 2419819, 2419918, 2419996, 2419997, 2419975, 2420027] into oc-release

Change-Id: I215c265a9300ab5296892784ce38a1f28b6bd335