Japan Overhauls Self-Defense Plan