Fix proper line removal and remove printf string in replacement line

Change-Id: I62b1f6cf4f6750b8fbccb1d79d1278aaf40280aa
(cherry picked from commit a1f2d83e3455c1ca0263f4104411da8a3cc85bbe)
1 file changed