Resolve some more merge conflicts of previous pull

Change-Id: I56f703ac4548e729f941953c1dcb276529d51347