docs and comments

Change-Id: I5d7257d8f4590c437f2c5b5c0b3c5d0ca7302411
Merge "docs and comments"