Properly handle alphanumeric 'numbers'.

Change-Id: I326198c19bb567846d09f8bb8c293a024c830296
JIRA:CYAN-3234
Merge remote-tracking branch 'cm/cm-11.0' into kitkat