Merge "Fix "Dereference of null pointer" compiler warning." am: d2862051d0 am: bf8ecdce4c
am: c5fb338d75

Change-Id: Ia56f188a8545b409bc01ac9a894f454e3604d8c3