Merge "Make mMatchSubscriberIds as a NonNull variable"