[DF-5025] Android fixes