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