Merge "Merge "Remove android.icu.... classes from light grey list" am: c6b17ad431 am: 1519c387e7 am: f82d01d16f"