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

Change-Id: I516e776107d193291033a1768e31364ebfcc42b7