One less integer

Change-Id: Ie94b28694c12182652464c4b8e61ab4c67905b07
Merge branch 'cm-10.2' into martincz