[TIMOB-7673] Address comments for android portion of PR