Update doc comments and code formatting.

Change-Id: I1896d7b1ab5d11d3a609fd97db7c503ad6c590e5
Merge "Update doc comments and code formatting."