Fix mount points

Change-Id: If40075588c6838ccd8d3737af5264cb0137db2f5