Merge "Small change for new sample test code" into nyc-dev am: e5e9265e09 am: c9ac62857d am: 6f300c1729 am: 764b00b9f1
am: ac5bbaf17a

Change-Id: I47440a7202dd62f013c16a223a00a8ae8c795eab