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

Change-Id: If2eb8cba1df0760fb2c01e65e28d9b3f8ec4912c