[automerger skipped] Fix typo in comments. am: 40f67c52bb
am: 17311a32da  -s ours

Change-Id: I6ce6ec5406a138472d271fc54038903a26f67e7f