Revert "Merge CM brach 'upstream/jellybean' into jellybean"

This reverts commit 26186f9313e6473458a68a01d8b827799fc7b8dd, reversing
changes made to 5dca0fa157769f320d4ac49e97535ae8b9ecc30c.