[automerger skipped] Merge "Add global cell ID to all technologies" am:...
[automerger skipped] Merge "Add global cell ID to all technologies" am: e803aa15 am: b5fb88a0 -s ours
am skip reason: Change-Id I2174e8d8c286da200562ef77cff78c3fca26cee2 with SHA-1 c78abaad is in history
Change-Id: I72ccd3849a88cafbd56ff2b5e36a9b2150a83606