Merge "fix warning: Dereference of null pointer"
am: a2e67eb95e

Change-Id: I37a6738f637cfa1a5fa0ccdf0ed7f3aa2986b207