Merge "Merge "Remove android.icu.... classes from light grey list" am: c6b17ad4 am: 1519c387 am: f82d01d1"