Merge "Cast AndroidResources back into the firey chasm from whence it came" into nyc-support-24.1-dev