Issue #2212819 by mikeryan: Update sample API for 2.6 changes