Reapply comment changes from failed am 40193d94

Comment updates from commit 40193d94 were removed while fixing
a merge conflict. This change reapplies them to bring master back
to the same revision as lmp-mr1-dev.

Change-Id: Id6cd8fab7f13ada4077cb2edfc17681086f16611
1 file changed