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

* commit '379f0f04cca66b5fe3dcd96ef81b267d8fc0de03':
  Fix activation issue with auto disabled sensors.