Own-ifying!!!!
Merge remote-tracking branch 'own/cm-12.0' into cm-12.0