Remove duplicate if statement

Change-Id: I7a9605815186d1dda79085bffa4250ee7497a5ed
Merge remote branch 'cm/cm-10.1' into cm-10.1