Merge cherrypicks of [7293853, 7292376, 7293922] into oc-m8-release Change-Id: Ie3a8c6348391164e69cbffdd970bf0fe40761ba8