Ensure record placement validation does not prevent updates

Change-Id: If085fed9738dad41d84836f258ad1b39cdc9cb32