Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID"