Merge "Added missing check for MANAGE_USERS" into mnc-dev