Bug 876772 fix

uplift to v1-train.