Merge "Remove pre-ICS crap."
am: 61aa5ecc0e

Change-Id: I90c668fd5b869171a7926444ae171ead4b8cd360