Fix bad merge

Change-Id: I76dcf7b7466dce5476fbb604f8781136f772eb22