Merge "Remove extra space at end of line in output." am: 43c6d31c43 am: c3e3e5052d
am: 3d49081c0c

* commit '3d49081c0c1a64e3aac4d97ec9a16eb92e57f40d':
  Remove extra space at end of line in output.