am 8a4078aa: am 7fa4026c: am 990a9b33: am 2953da4f: am a6c275c1: am e8be6f74: am 4865f818: am 0486b377: am 0dbae774: Merge "Avoid an NPE"
* commit '8a4078aa33caff1341d75a26f488b858973e810b':main
commit
a96c872ac0
* commit '8a4078aa33caff1341d75a26f488b858973e810b':main