Moved a few comments back into position

No code changes whatsoever - just formatted some multi-line comments
which uncrustify could not understand.

Change-Id: I85e2f58681c61be937315414dc2a708974b027f8
Merge "Moved a few comments back into position" into release-4-6