ALOY-895 update for Android