Merge "Fix test_stamp_pattern to remove dependency of user supplied volume name"