Merge cherrypicks of [3122088, 3121430, 3119129, 3119130, 3119131, 3120667] into oc-mr1-release

Change-Id: If407b5d78299ba0be9410de4546042986fd65758