Merge cherrypicks of [3063860, 3064438, 3064439, 3063679, 3063680, 3063681, 3064498] into oc-mr1-release

Change-Id: I3e5426d43227e5ad01b8477a848e50cb6c311afd