Fix file mode, remove executable bit.

Fix file permission mode which was improperly set to 0755.  Also some
minor tweakings to the comments in code.

Change-Id: I6ca2aefeab6710cdc83c3273843cb555065078e9
Merge "Fix file mode, remove executable bit."