Merge "Fixed the format issue in the sample"