Update formatting and comments in FormatJson

Change-Id: I4edc08760004e170b045b201d3cc5444b2028e55
Merge "Update formatting and comments in FormatJson"