Bugfix: Don't ignore a user supplied android id.