AndroidTracker updated (minor fix for safety)