Changes to make compatible with Android 0.4.2. SDK Test app.