Merge "Fix null-pointer derefernce warning."
am: 955e85294d

Change-Id: I492db6e2ea9cbe052f4120aba3477052ad791a29