Merge "Change Android-specific customizations that get preserved." into main