Merge "Add hidden minor version ID for support lib workarounds."