Update and clarify some comments.

Change-Id: Ia329866d5f01a4b27aa47288a6bce1f81629c651