Format source code (manual and generated) to avoid problems with merge and rebase

Change-Id: Ia6370c7675fee0bcf72eed9f79a3379e29e0f38d