Merge commit '264952afbf3986a2af4c2fa6b8daaed04f34fee8' into froyo-plus-aosp