Merge changes I45b993c4,I09b09408,Ia7406fbe,Ic6ba2d66

* changes:
  Fixed NPE when OsAppId is null in traffic descriptor
  Fixed incorrect state machine transition in data network
  Fixed unknown RAT in IWLAN registration info
  IWLAN handover optimization