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

* commit '210b0a5a20830beea3b3e96e84c6b3fd2a626cf5':

Change-Id: I0ead2ccee7d8a2db4a2ac585a2054ee80abd569c