Merge "Small change for new sample test code am: acb3eb39da am: be34171986" into nyc-mr1-dev-plus-aosp
am: 05388c5918

Change-Id: I5d8a3723cbbe573d8b7efba797d4be6b58f72137