Fix pretty format warning stripping, again

Change-Id: Ib8d0ad8e150da07cc60587e6c5103ae4c373d5c0
Merge "Fix pretty format warning stripping, again"