Revert "Squashed merge with cm-10.2"

This reverts commit 8847a02a77acd9532971c584c282c395ffe6591d.