Update documentation and formatting for includes/deferred/

Change-Id: I56f35be6e549aec13c4fbad5ee6301aa29358031
Merge "Update documentation and formatting for includes/deferred/"