Merge "Small change for new sample test code" into nyc-dev