Revert "Merge remote-tracking branch 'origin/cm-10.2' into cm-10.1"

This reverts commit f260924636a55ec68aa7fdc2cd9709d0c9e9a3ee, reversing
changes made to 7eb6b2bda05c82b9352589e6391726678cf002dd.