Merge "Parse merge commit recursively" am: 43f13ddb3a

Change-Id: I21b12bdde3aca6c26e49a10a4e75ec98138e6890