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

Change-Id: Ia0b11bfa66bf25950afa5304ca1de3be4cb9207c