Merge "Fixup more potential issues / warnings in string formats"