remove unused variable

Change-Id: Idb89503140a6a3385fe17990e3484fe71883885f
Merge "remove unused variable" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0