[DF-291] Android debug commit