Update formatting on includes/deferred/

Change-Id: Id3f143eae3781b26dcbc3ba63a566b7a6006c0cc
Merge "Update formatting on includes/deferred/"