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

Change-Id: I8c39aa9a2ca029a3fb0c1f93227721bd439468cd