Merge "Merge commit '8812fdd7' into manualmerge" into dalvik-dev