Updates for paths

Change-Id: I21f34e63e4c5d64192dfde0452a02f43b9913684