Try2: Cherrypick sensor updates