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

Change-Id: Ic5a7c87f341e0f48b061c2837a50ea7bf5374b20