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

Change-Id: I05fece3cd91b66b5edae31874b88c0347c01c1d7