am 57ac9afc: am 8e5c6d70: am fd15686a: Merge "Fix an NPE"

* commit '57ac9afcc8e35aa118a431978b1eac0b79772e19':