Edits mostly to Linked Files and related

Change-Id: Ide40de665fb83a070fcb1ff521154324e2e97351