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

Change-Id: I219d78214fa444a79cca34e6c3b1d728bf2c2e79