am 990a9b33: am 2953da4f: am a6c275c1: am e8be6f74: am 4865f818: am 0486b377: am 0dbae774: Merge "Avoid an NPE"
* commit '990a9b33551e989d4ba5d97aeee33dc3a0cdfee2':main
commit
7fa4026cc9
* commit '990a9b33551e989d4ba5d97aeee33dc3a0cdfee2':main