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

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