Merge cherrypicks of [6714499, 6716593, 6716594, 6716595, 6716596, 6716597, 6716977, 6718226, 6717773, 6716978, 6717663] into oc-m8-release

Change-Id: Ieb4c3a0b3350852b8db4c4638b35fc2c6f6ec362