Merge "fix null pointer exception" am: 09fe4c0241
am: cbd4680c1f

Change-Id: Icf5f99f9b252406cb0fd0c041c2db3c8e9a2710a