[TIMOB-15739]Refactor android code.