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

Change-Id: I438a87121615d4cc3d77d6f7a508a453d555d385