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

Change-Id: Ic396b2bef7b21fa9fe0ed86d00dde30a58c55087