am a4d94493: am 6877060b: am 4afd8ff4: am 0874939e: am a8b838b4: Merge "Fix a test and crash with a better error message when reading"

* commit 'a4d9449325f98fa99ca7fee5fbe212b8d63db21a':