Minor comment corrections

Change-Id: Ibe516911e76bb250bc5ea582b0d8b8a3b12890f1
Merge "Minor comment corrections"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp