AGDROID-11

not any near to solve AGDROID-11, but issued the PR to get feedback, and check with the team if it goes along the right direction or not.