Fix Malformed file and add common remote.

Change-Id: Id38441a7dccecb040b9709096e251551b3a779a2