Cleanup

Change-Id: I92cc54f360032e34e138e2c460d49f24dc028923
Merge remote-tracking branch 'cm/cm-10.1' into aokp-mr1