Merge "Add missing null check" into pi-dev
am: 8eef782e32

Change-Id: I65f07944eebe45d867f1b8250cd034dcfffd2816