Update formatting of includes/normal/

Change-Id: I3b6f34c62db8dea3f5bce50a15105c8c1a769903
Merge "Update formatting of includes/normal/"