Update paths

Change-Id: I877e51a64e698432054201527e8ad27c8c160be1