Fix typos in comments

Change-Id: Id533a58450ae6de42004cf783aa86663ed8a7d42
Merge "Fix typos in comments"