Cleanup and Update for Android 4.2.x