[DF-1067] android support