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

Change-Id: I17cac55c823ca9cc39c9cebb38876761ed183c7a