Merge "Restrict access to uid_concurrent_*_time"