Merge "Small change for new sample test code" into nyc-dev am: e5e9265e09 am: c9ac62857d
am: 6f300c1729
Change-Id: I6371318fdc75f8b84f899973de81781715d79e12
This commit is contained in: