Be a whitespace nazi

Change-Id: If59c32fe97d532d85a6518042dff99bc0714d3d4
Merge "Be a whitespace nazi" into pac-4.4