Fix up latest merge

Change-Id: I0099268195a2346fd4d5487ef99edcccaf83811b
Merge remote-tracking branch 'sgt7/cm-10.2' into cm-10.2