Fixup more potential issues / warnings in string formats

Change-Id: I323e44f950b2e758dc9ff4510b2e13ca870eb849
1 file changed