Merge "Small change for new sample test code" into nyc-dev am: e5e9265e09
am: c9ac62857d

Change-Id: Iede40ce493f46da6d74038e222c820993b6bb072