Merge cherrypicks of [8714308, 8712886, 8712887, 8712888, 8714213, 8714214] into oc-m8-release

Change-Id: I5f456aec8c43107e95b063c5e16f917bdd21b9e9