Merge "Make sure to compare subtype language with system language." into nyc-dev
am: 0f3647f444

* commit '0f3647f444bc6fdade70d91f473d599a53a1778d':
  Make sure to compare subtype language with system language.