(cherry picked from commit 6fc1f4fc21cc45f99e4faee52702abd4def4c2ae) # Conflicts: # i18n/src/main/res/values/strings.xml