am 8a961759: (-s ours) am 86ade472: Merge "Initialize SubtypeLocale from...
am 8a961759: (-s ours) am 86ade472: Merge "Initialize SubtypeLocale from Settings (DO NOT MERGE)" into jb-dev
* commit '8a961759':
Initialize SubtypeLocale from Settings (DO NOT MERGE)