Fix 1 more bad merge

Change-Id: I749623897d1b669e462c219648de3272bef112dd