Ensure forward compatibility with
Ia1017dcef462f3ac1ff5112106f7df81f5cc384f by adding
forward-compatibility test data generated by
Ia1017dcef462f3ac1ff5112106f7df81f5cc384f and verifying that tests
pass.
Change-Id: I109640b510cef9b3b870a8c188f3b4f086d75d06