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

Change-Id: I99cb39bc90224c2c59e392eb02f5ce8d1c5b99ab