Merge "Fix potential concurrency issue with setTechnologyTypeExtras." into nyc-dev am: 495b527
am: d90238b

* commit 'd90238b5b76dfee1a1723cd1faf815097f750682':
  Fix potential concurrency issue with setTechnologyTypeExtras.

Change-Id: I1f4a2cf6d221ddf262364ad1f7e1e002676c44c6