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