For update of traits list during certain saving conditions

GCP-9595

Code review : Daniel Jao