Merge "Revert "(reland) Upgrade sensors to @2.0""