Merge "Add permissions required for flashing"