Merge cherrypicks of [2944626, 2944869, 2941173, 2943653] into oc-mr1-release

Change-Id: I74fd4a10cd42d77bece97dff800f3b5beef5d17c