Fix merge taint

Change-Id: Id4641503b68797a2cb83857d8dff6902797e0157