Fix changelog typos

Change-Id: If217913697ccde09e3eeb8ae32b5bb429c925b1c
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0