Merge "Revert "Revert "Return an interface object from addUsdInterface ..."" into main