Merge "Re-add light-greylist entries incorrectly removed with icu entries" am: e6e6968081
am: 8c265bf5a7

Change-Id: Iabb7fb1fabab8eb1a67e09870b856367140d8ca1