Merge "Update Eclipse plugin to handle new LocaleQualifier API" into studio-1.2-dev automerge: 9042534
automerge: 05cde4d

* commit '05cde4d41f10854235174706934549bfb97dac0b':
  Update Eclipse plugin to handle new LocaleQualifier API