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

* commit 'f58aa342832e69896c21d13d66e6975672af08ff':