Merge "Remove role checker for non-selfManaged association" into tm-dev