Overhaul for CM10.1

Change-Id: I3ffdd5310bdeb547bb2700453a23168bb3a9fc0f