remove unused variable

Change-Id: I0f66df38964baccd1c8e58fa7006cb9db5fc6df5
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0