Merge "Suppress null-dereference warning" am: 3b7ecd55f8
am: 86f9078b54

Change-Id: Iff805b933dbddfaae22de3ef34caa8b391dedfe9