Merge "Do not dump records not visible outside a translation unit." am: 82e1d2f65e
am: 1d12873cfc

Change-Id: Ia99e4d9695b008bea60e460164da6208fc46d00f