Fix the typo and reformat the comments for the added option

Change-Id: I01c471976f2c6d80bfe629b61ab75b81d6cabb1a
Related-Bug: #1175904
Merge "Fix the typo and reformat the comments for the added option"