am 60131264: am 1c2c2da7: Merge "Relabel sensors files"

* commit '60131264f6d30319b28980005a4b014f36d2c050':
  Relabel sensors files