Merge "Runtime permissions: per user permission tracking."