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

Change-Id: I2aee7d2a254fde80cb47eb121651c8eaaac1e9d4