Merge "Prevent null point exception" am: 45b03edd00 am: bfa1f2979e
am: 14990a1901

Change-Id: I5ef5583fb0c1a0943941a378d4421bedec703371