Include commit id and message in merge commit message

Change-Id: I2557eddcb4fbd4fd1ec5c608a0d73c7fa1b243b6