am 7c043486: am 379f0f04: Merge "Fix activation issue with auto disabled sensors." into jb-mr2-dev

* commit '7c0434861eb2ac6c408e5f56b5c8ced6da1beaf3':
  Fix activation issue with auto disabled sensors.