Merge "Added IWLAN handover support"