Merge "Implement alternate SE RoT provisioning" into tm-dev