Fix merge conflicts

Change-Id: I4d5ed78a2af9aa3b7d47daee2776acaf9679f631