Fix typo

Change-Id: I311f608d761987d0c714be9ab81188a3ca8eef61
Merge remote branch 'cm/cm-10.1'