Fix bad merge from cherry-pick

Change-Id: I13a90edd19e63ec3d95654fc58804574945cb1f5