Update formatting for includes/diff

Change-Id: Id032a32ca6ebea3daf5313a05602c5e98603d983
Merge "Update formatting for includes/diff"