The solution to this is simple; erase your devices before you cross an international border and carry no data storage. If the reset device was taken from you then it's been bugged go buy a replacement. Otherwise just log back in to the cloud on the other side.