Merge cherrypicks of [3628900, 3628843, 3628708, 3628812, 3628709, 3628710, 3628711, 3628658, 3628659, 3628920, 3628844, 3628845, 3628751, 3628752, 3628753, 3628921, 3628922, 3628923, 3628924, 3628925, 3628712, 3628713, 3628714, 3628715, 3628926] into oc-mr1-release

Change-Id: I2de9756230e76aa82fff43dbe5375dae0ad34912