Merge "Increase limit of locale pairs" am: aa9a59ab32
am: 22ff1759d2

Change-Id: Ib993597558b13e9879dc56014af8529aa84c4480