Merge "Shenanigans to make create_reference_dumps.py more usable." am: 5bb0ba722b am: 922e82979d
am: a3c269f46d

Change-Id: I443310820093a5d329c3a1439829e887325dca41