Merge "Remove obsolete strings (rather than fix l10n guidelines)." into honeycomb