Merge changes from https://github.com/commaai/openpilot/commit/1ebe06d1c2339680452a8d9c08cc76bd38ee0949 and https://github.com/commaai/openpilot/commit/6c25b44369228915c825bbd1b178dc32f8505395. Can we use the same installer on both now?
Merge changes from commaai/openpilot@1ebe06d and commaai/openpilot@6c25b44. Can we use the same installer on both now?