Merge "Introduce recursive dumping/diffing of types." am: 0e5578b2e2
am: 10d3be1e44

Change-Id: Ie60c910205c29ddf5290bb4fa467aed6f7ae7c3b