Merge "Remove android.icu.... classes from light grey list"