Simplification, get rid of a member variable.

Change-Id: I5a4e72837302c74a685e2e3a8e221345fb1871d7
Merge "Simplification, get rid of a member variable." into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1