(cherry picked from commit d11c72fd48150f792050fb6f689d0be3a0a672c7) # Conflicts: # app/src/main/res/values/strings.xml