Merge "Allow vendor_init to access unencrypted_data_file" into pi-dev