Don't remember which was it from, but I recall seeing an episode about a scientist who was the last survivor on Earth and designed a robot to serve him, he's a like a butler. All is good, but the master/scientist is still not happy. I don't remember the middle part, but the end was a sexy woman going into the room to serve the master, and she turned out to be the robot changing into a female body to better serve his master.
It might not even be from TZ or OL, but I'm sure it's black-and-white.