Fixed base conversion to prevent app crash on tablets

Change-Id: Ib66af0cb22d73c255819dc489925b92b8d2fb520
Merge "Fixed base conversion to prevent app crash on tablets" into cm-10.2
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2