2075788ffc
This commit also includes minor doxygen style improvement. Change-Id: I5ced859c0759a2fd0240068296949067f9ac4c46