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

Change-Id: I4ef0d1dbbe896dfa0fc9ecf3378bc04c017f5475