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