am 1ba90786: am 28e26eb3: Merge "Fix for ClassCastException in SystemSensorManager." into klp-dev

* commit '1ba907867d299cb76317c510a2802189f51ce5f6':
  Fix for ClassCastException in SystemSensorManager.