Merge "Require usage information for runtime permissions"