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

This reverts commit 1d21f83bc420bab6f73fa676f4b527483bb308c6, reversing
changes made to d429ae09465de82ca0a28a00f7e8e827e43606b2.