Merge cherrypicks of [2619075, 2619057, 2619058, 2619037, 2619061, 2619062, 2619041, 2619076, 2619081, 2619069, 2619135, 2619171, 2619172, 2619153, 2619154, 2619155, 2619173, 2619156, 2619157, 2619174, 2619136, 2619138, 2619139, 2619144] into oc-dr1-release

Change-Id: I35ef9b212ef6eb07e9dfa6b258f5835796dcb8f4