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

* commit 'c3fb41d0cd7c172934054794368587d6f62b686b':
  Support generated samples_toc.cs file.