Merge "Reference the correct capability type for reply capability." into nyc-mr1-dev