Merge commit '0dde41fbe0e36bfe059399c839604267ad0318c1' into froyo-plus-aosp * commit '0dde41fbe0e36bfe059399c839604267ad0318c1': Fix 2610961