am f58aa342: am 686160b8: am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge: 7da2b5d
automerge: 3279949

* commit '327994977fa865421c522cf089a2692b2c837ed5':