Merge "Updating demo pod configs"