Merge "Add debug logging for one-time permissions"