Merge "DSDA: Add explicit handling for checking call type" into main