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

Change-Id: Id09581405df786ae008c3b4d88299b3913228312