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

Change-Id: Idcbe5fa1e732b74b26472bd5f5c541187fd0df9d