Merge "Mark getStagedSessionErrorMessage as @NonNull."