Merge "Parse merge commit recursively" am: 43f13ddb3a am: 8d913adcc1

Change-Id: Ic8ce1e48ea24e3495ae66f1f273a0df8c3bcdc1e