Merge "Add a null check in case device disappears." into pi-dev am: 3c6f5390a2
am: 2d7553da52

Change-Id: Ic84cc381543de9d450ca0c09e0eb024da8bd959f