Custom changes for Android testing