Fix missed conflicts

Change-Id: Id7b57b9811f9f367879f28a1b0d67698a0f46f8a