Merge changes I4e976920,If2a1e621

* changes:
  Update override network type on PCC changed event
  NetworkTypeController update on PCC changed for LTE/LTE+ switch