am 961499ed: am a4d94493: am 6877060b: am 4afd8ff4: am 0874939e: am a8b838b4: Merge "Fix a test and crash with a better error message when reading"
* commit '961499ed315af707350745b18d575b744ca8bf7c':main
commit
c47e7d77ad
* commit '961499ed315af707350745b18d575b744ca8bf7c':main