Unblocked 26877.
Merge pull request #175 from roydude/v1-train

Unblocked 26877.