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

Change-Id: I5b50f7e7633dc56beeac52d5d06c3415cf1e5285