Merge "Restore @deprecated annotation of ngranNrVopsInfo" into main-ims-dev