Merge "Fix typo and remove executable bit on source code files"