Merge "Update GlobalCellId during Un-parceling" into rvc-dev am: 6f918dbf7c am: 47cb68cc69

Change-Id: I96c5ec16a8b32f102383803adc1a7eeea06de802