fix merge

Change-Id: I5a65823e4ad3c52af5cdeedacb5034836d0487b0