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

Change-Id: I1dfb95909fd5976b551cf705344bcab1e7d1c489