Merge "Fix "Dereference of null pointer" compiler warning." am: 18dc831e66
am: ff95675c5f

Change-Id: Idb1c5013ebd6cecdcf5c0990dc3f57169c2f62c6