Fix merges

Change-Id: I006dca54160c790ad5f261b4ce4de3e2031fedc5