Also removes trailing spaces in empty line Related-Bug: #1481748 Change-Id: I91af71a6861a29a07ad6ae9cc8f27c4cf87f39a1