Resolve the conflict, had missed it in my earlier commit

Change-Id: I4a83db2e5e8ff7f5172618c842a1ac9467d7d20e