Some paths were not prepending

Change-Id: Ia9e04c516c3b2b7355b61387e6b8654705e5725f
Merge "Some paths were not prepending"