bring d2-common up to speed with CM

Change-Id: I128efc76df2cface83ed3d430d2cd5aba61e3d24