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