Merge "Changes required for running CI tests (Pike pod)."