fix sensor issues

Change-Id: I5ffa38c6be933cf6445f18d114e78445bd905ece