GPII-360: Adds Javi's fix from the v0.2 so that the system starts up correctly on Android.