Attempt to fix bug in trunk updating.

Change-Id: I04e3f76d53b33d5a56a934925a3c2ee099e6e6a1