Merge "Fix 3337625 to follow link to Google Images" into honeycomb