Merge "Fix null-pointer derefernce warning." am: 955e85294d am: c12499d5c6 am: aef21a74a6
am: 33091682c6

Change-Id: Iabf28befa504c6f4a18bed344fe4c64c0b3c9030