Temporary[Dirty] fix for WAUTH-2

Fall back to Nokia S40 for fixing end to end encryption