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

Change-Id: Ic4e229d93f1ad4cefa1abc7d4e31991d89cceec8