Missed some changes.

Change-Id: I2c7d1db023e1d7be2101bea42d0d52110d9f691d