OC-2746: Update Sample Library for changes in library