Merge cherrypicks of [7077328, 7074021, 7074022, 7077576, 7077577, 7077578, 7077579] into oc-m8-release

Change-Id: Ia405dd36e65b96bc831cba3be8fb69b05336556b