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

Change-Id: I7135571a65625f3aa3ada7a0c1b00f08c565fce9