Merge "t0lte: sensors clean up" into cm-11.0

Change-Id: Id36bfd1c25a98ca8fc06c0a8fa4d78e103c55e3a