Merge "Fix the potential NullPointerException."
am: 4b5c8e1076

Change-Id: If2b68e47eacb1faf9ce50161322ccbed9c8253c8