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