Merge "fix warning: dereference of a null pointer" am: 9a6b9ed394
am: 90b59dbb0d

Change-Id: I032627fd4dfa35421e2dd7c81c008b9e87c8470c