Merge change 7054 into donut * changes: Change the GoogleSearch strings so that "Google" shows up for the label in global search, but "Google Search" shows up as the name in 'manage applications'.