Using merge rather than rebase.

Change-Id: Iad77fef8047dddd126513156ef18415ae3386b27