Fix and gate on H501, no locals for string formatting

Change-Id: I07e4a1a733639a343d4b3ee20927d50ba04bd7a3
Merge "Fix and gate on H501, no locals for string formatting"