ALOY-895 update for Android
Merge pull request #371 from federico1525/ALOY-895

ALOY-895 test case update to include Android