Fix typo

Change-Id: I40b5e5c2aaba23f127d768a61dafccba048a45b4
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2