Merge pull request #11707 from SteveCEvans/unified_bmi160