Make path names relative

Change-Id: I44afe86d6b7bbc3da20cc87ae0f35544703cfc9e
Merge "Make path names relative"