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

Change-Id: Ibd255cbdaa91e1770471aa1e84151105b33915a3