[OEM-141] Update for modified address schema.