Merge "Fix matches_locale function" into nyc-dev am: 8b86373 am: 210b0a5
am: d32182d

* commit 'd32182da0014b52cf23cc5865d7465b6eda99e6a':

Change-Id: I1adf6606782eb844d5993709715e463d3bb6efdf