Merge derp

Change-Id: I108314a8ef73bfd26f6a2ba90d313832b0f26699
Merge derp

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