Merge "Use the correct index while dumping denied permissions" into tm-dev