Merge cherrypicks of [2558967, 2558975, 2558968, 2558969, 2558970, 2558976, 2558977, 2558971] into oc-dr1-release

Change-Id: I94f1d10be05d3cab88f80cc58b96493712ff1c8d