Merge "Fix SampleTest test bug." into jb-mr2-dev