Fix git's wrong 3-way merge.

Change-Id: I30520ff78f47bcfa487cea6f40904bf718610967