Update doc comments and code formatting.

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