Merge commit '6a0e513d7d40e34caeb85fe55d21609946448915' into honeycomb-mr1-release-to-dalvik-dev