Fix Malformed File and add common remote

Change-Id: I7cb88eb77ba5cac200f7c4f5b288111e2ad3923e