Merge "Fix security hole in Google backup transport registration" into froyo