Fix issue with null value returned for Android version & test from iOS version