d2: merge apexq

Change-Id: I55e6c248959e0a0657bbd8e3840470ae7adbd5ed