Finally rebasing to code targeting Android 2.3.3