52a0aa9d47
(cherry picked from commit 78b9ac4766)
# Conflicts:
# app/src/main/AndroidManifest.xml
(cherry picked from commit 78b9ac4766)
# Conflicts:
# app/src/main/AndroidManifest.xml