Updated so that the diffs work for the mt test.
Authored by: tswift 2018-04-23
Parent: [r9260]
Child: [r9262]
