Fix incorrect comment (and a typo to make Hashar happy)

Change-Id: If24d7042ca7ebeadedda82d425f5de8a8ea99cd2
Merge "Fix incorrect comment (and a typo to make Hashar happy)"