This is required to correctly instantiate and query endpoint params Change-Id: I8f048e342530da98ed14f93a59b2a27d4a1b0040