Backport to Froyo