LPS-44574 - make consistent with sync-engine-shared
LPS-44471 plid is not mandatory
LPS-44471 SF