Merge "Fix dereference null pointer warning."
am: 4065e775e6

Change-Id: I3fe4175c7b3957f3146e235efdb18ff2b1b54d08