Some prep work for Android
Attempt to add registration id updating