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

Change-Id: I00ab2347b438dba009bfd597526a27e09bfc72a6