d2-common: update to align with upstream

Change-Id: Iaa60a63c7a1af434a88d96b7a1654ba08d9ffcfa