Merge "Remove dependency of impl on onf-extensions"