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

Change-Id: I1cea6ec6f5fe1132f60043b38c3dd8dea2793011