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

Change-Id: Id2d8a10bc67eda46431234911d324e58a639f3cf