Merge "defconfig: apq8084: Enable diag forward driver"