Merge "API review response for d2d relative APIs." into sc-dev