Fix merge conflict for fad81abdb6dc0701df620769cacb7719a22b7722

Change-Id: I1868c9d9e17ff8e38f4723434fc214a7986b64ae