Merge derp

Change-Id: I502ee95f6ec2668b27d3cae14551ab8ffcfb7cbe
Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1-sgt7