Merge "Fix NPE on a device having no sensor" into pi-dev am: 6420382ef5
am: 75a3b27c49

Change-Id: I97006b0601ff9cfdf5e23d148f96319ad7ac51d9