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

Change-Id: Icb470344054623197d204d8666941e5d58ea0c06