Fix merge

Change-Id: Iec3baa8449b7975aadc5411713be8ede3658d725