Herp

Change-Id: I270c336c8d6595349dff18753e25497689d14914
Merge "Herp" into cm-11.0