Merge "Fix potential NPE from 326226" am: d9a5fa50bd am: e5ef92a107
am: d8223ed954

Change-Id: Id4b7ebd58d4d616afa08601ca79dfa2e4e53e219