Fix missing part of merge.

Change-Id: I0466fc9feb889193c49c3551aa0241db3bda3bb2