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

* commit '495b527dfd9e337068fa76b97d1d8e9f38c3b802':
  Fix potential concurrency issue with setTechnologyTypeExtras.

Change-Id: Ie402dd9348360feb9012b59ab0bb9196de1ac904