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

Change-Id: Ia240034c791cfdf911a45e88e1c33516c975124c