[automerger skipped] Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID"
am: 9ca4d43922  -s ours

Change-Id: I2e148a4e55510acf0c0425b7e1ed6cdc1fb9eb34