Merge commit '720d1e962e248a30f81c1493081ff4c01e35c839' into froyo-plus-aosp