7a9bde9ab1
Merge commit '6ee44d1ff30627388bf3afa5fa542780af8f4005' * commit '6ee44d1ff30627388bf3afa5fa542780af8f4005': Fix 1840639 to support overlays with zz_ZZ.