Derp fix.

Change-Id: I124eb9e6b74556c6ff4ddb1e5335a758dc9250bf
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1