escape spaces in path

Change-Id: I12320dc9faaf7563494740103a3d35eee5af49d4
tag v1r1p4

Change-Id: I9bfe2195e274fd662c7f4920e4b443e2e8930037