am 01a406c8: Merge "Fix build with sensor.h"

* commit '01a406c8eef024ff91268a0b385f372109de13ad':
  Fix build with sensor.h