Remove extra whitespace at EOL

Found by niceness gate

Change-Id: Ia644fac13419beff7ee57dd11f42f62ecd01ece9
Merge "Remove extra whitespace at EOL"