[OEM-141] Update for modified address schema.
Merge branch 'hotfix/oem-141' into release/1.6