Merge cherrypicks of [2463695, 2463745, 2463732, 2463679, 2463844, 2463803, 2463746, 2463616, 2463786, 2463747, 2463881, 2463733, 2463804, 2463863, 2463787] into oc-release Change-Id: I0e0c89963d4f1d4560d06b216fa35034da477c6e
