Several things were done incorrectly in previous pod. Fix that. Change-Id: I7387964979b4ceef4dfda2349023aa0267320349