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

Change-Id: Ied2a041b14d087089a3faeffa5f4a586f30adcea