Clean up two problems in the Android Feedback migration of existing
experiments.