Merge "Update changelog for M8" into cm-11.0