Merge "Removed executable flag for Java source files" am: 9a7c651196
am: 9304dc9f36

Change-Id: I3123d49a045b91be0b1a22531110b069dfcf8890