Cherrypick sensor updates