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

Change-Id: Iaba76c1d4b87016efaa9182f45b21da25b4606f9