Merge commit 'a08eb1df005189fdf5881b0f7b2f9258a97fec00' into honeycomb-mr1-release-to-dalvik-dev