Merge "Remove dependency on Exificient due to licensing incompatibility"