Unblocked 26686.
Merge pull request #233 from roydude/v1-train

Unblocked 26686.