This reverts commit 44d15f1c2e. Fix doc comment errors. Change-Id: Ieeb07b907f0c66a133ef57136c45c504bcc04694
44d15f1c2e