Merge "roots: Fix an issue with volume_for_path()." am: dd7a4b5264
am: 8b8c7eb442

Change-Id: Ia87f2388e47fa083a5e9e1e4d49d3021d808cb2b