Merge "Fix matches_locale function" into nyc-dev am: 8b86373
am: 45609d3

* commit '45609d37efe3ced3a599b6eccd6e6dbd184152e6':
  Fix matches_locale function

Change-Id: I3f3a41dbcb4ab42d287f36b6ff0f2eaa6806f99a