Merge "Modifying pod configs for edgecore"