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

Change-Id: I770b196093add7d82f3ddd330caf81c27c712cb8