Merge "fix null pointer exception"
am: 09fe4c0241

Change-Id: I69e5ef278c87a243d6074f4718f0b0761e5c92a0