[OEM-141] Update code for modified address schema.