am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"

* commit 'dd8ca1f821c4f64f561e1d1badcfa5deb13de96d':