Merge "Allow callers to pass a flag to not link obb dirs of multiple users." am: 0c8b8af74a
am: 5a8d603d9d

Change-Id: Ia996870b58caecce6077f5144aeb6b9b59135ade