[TIMOB-17327] Android: addressing PR comments