am 829e4db4: am 0bb2c170: Merge commit \'bb94d790\' into manualmerge

* commit '829e4db46fc5ea3816b7d6432b9bacb96cb68294':
  Support generated samples_toc.cs file.