Revert latest changes and use most recent Android Client tokens