Fix sensor structs

Change-Id: Id5f1ef8cd6bf7c9e4a1fc2de2404bf913e344cfa