drop d2-common back to cos

Change-Id: I454a650adec4a944bcd453b8c6e7ee8b7e4c4990