[PRQ#57777] Merge Request for android-sdk