98781683d7
(cherry picked from commit 6c9b982104)
# Conflicts:
# app/src/main/AndroidManifest.xml
(cherry picked from commit 6c9b982104)
# Conflicts:
# app/src/main/AndroidManifest.xml