Merge "Introduce recursive dumping/diffing of types." am: 0e5578b2 am: 10d3be1e am: c7d76ba3 am: 5f029ea5 am: d83c2272 Change-Id: I362144c4e3e6e410af954a976ca807ee75781be9