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

Change-Id: I8ad4900f5c0d0d845ab086c6fc2240bd401b38db