Merge "Update annotations to spec for portal"