Merge "[Wi-Fi] Fix transition mode problems" into qt-qpr1-dev am: 5b71fccabd

Change-Id: If7bce1789dd81d3f77766fd9ed71dbc6738fb857