Fixed comments and added the doc primitive call Closes-Bug: #1623486 Change-Id: I704536530c576de702434008aa30a7fbbaddff25