am 54405015: Merge "Track LocaleManager API changes" into studio-1.1-dev automerge: 892f37b7 automerge: dd55a463 * commit '54405015': Track LocaleManager API changes