Follow our own d2-common

Change-Id: I3ac33c9754937261c752a409ca9f2730fbf6cac6