Merge commit '3224c08bd77043338ad6e9ecacbd4c118205e873' into honeycomb-mr1-release-to-dalvik-dev