Fix some merging mistakes

Change-Id: Ia3a96151e493efad63cb56ffb9446cfc20da705c