Fix merge conflict

Change-Id: I6efc369e474a2c059fdffafe1a28e2faeea7ec6b