Merge cherrypicks of [2594621, 2594622, 2594623, 2594625, 2594628, 2594629, 2594650] into oc-dr1-release

Change-Id: Ia9ba6e7717ca9de5e023c25e2fd2f6a36686bd0a