Merge "Added NonNull categoryIds for fc shell cmd."