follow suit with d2vzw

Change-Id: Ib711d86e80d5bb4233f0f957fc88f2b4c65a96c2