Fix merging issues

Change-Id: Ieef6211cbee55c55ee9ae09e92924e499fb8b7d7