Toyota Repair: Rav4 shift lock solenoid

Question

shiftbaseassy.jpg  

shiftassy.jpg   Key will not come out of ignition. Because it DOES come out when the battery is disconnected I believe the issue is the shift lock solenoid in the shift assy. It should send a signal to the keylock solenoid when placed in PARK. If the tumblers were bad or the Keylock solenoid was bad it would not release when the battery dies (Which it does).  IF this all seems like a reasonable theory, I need to know which solenoid on the attached dwg is the "Shift-Lock Solenoid".  The one that talks to the keylock solenoid. My Toyota dealers parts guy was great but we could not determine which solenoid was the one to look at or take a gamble at replacing to see it it fixes it. Or am I looking in the wrong place?

02 RAV4 L AWD Auto
JTEHH20V026035877

Answer
The sift interlock solenoid is located inside the shift console, the second picture shows about where it is supposed to be but does not actually show it, please click and copy this link into your browser for an exact location
http://www.autoshop101.com/forms/h18.pdf