Fix malformed file and also add common remote.

Change-Id: I9faa2d15c0164dd6241f44e113c7ee549881287e