0072a39b2b
I3166951c6fbb2faec53ffc339edd2fd0c3512300 recently landed without two fixes that I suggested, namely using rm -f rather than testing for file existance, and a comment fix. Change-Id: I68e187e20802f3482d4c524a6c435fec7526178e