Goodbye Chronus, it was nice knowing you (1 of 2)

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