Fix typo

Change-Id: Ib6c4b20030497b963390fe744e0a6620ace42f19
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1