[automerger skipped] Merge "Use new global cell ID for hasLocationChanged" am:...
[automerger skipped] Merge "Use new global cell ID for hasLocationChanged" am: 99ba3d7f am: d8364b13 -s ours
am skip reason: Change-Id I2c943bd1e434e4e3aa854985c132aa132fc1e420 with SHA-1 69655333 is in history
Change-Id: I5c7ee58286103c490c23dd04825658824ccacfa5