For proper operation of create field map

GCP-9513

Post commit code review : Daniel Jao