fix merge typo

Change-Id: Ic261e3fb628fb0c686f3093a98195f4ae5e8bfd5