Fix sync.  Follow linaro's 4.9 via vanir

Change-Id: I1338b2e243e6c5657401f3d65a9f83e12f20fd8f