Fix mount points

Change-Id: I110b57a033ffef19c5bc79f13539ac7acec2345d
Fix mount points

Change-Id: I02ab5b9d9983c980c20884c890dceaec9b280a19