Merge "Fix boot loop when upgrading sensor privacy file" into sc-dev