CMA-29 Android 3.x changes