Merge "Use the right volume content URI" into rvc-dev