Merge "Clean up config of tabs and trailing whitespace" am: a4c1416c28
am: 70491b73d2

Change-Id: Ic74b4c4c8093da3aeaabebf9bead792ea543bc4f