Merge "Add a flag to distinguish shared VMAs"