Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 am: a38224eadb
am: 18098b7de3

Change-Id: I640596adfbe3a345c0780d56b62ea6f9eb2b17f2