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

Change-Id: I7291799331753f7388d9c6e6d8a155a1fce01365