[DF-2815] Code changes after review. IOS, Android.