2f0f938d5e
(cherry picked from commit 738a3999b4)
# Conflicts:
# app/build.gradle
(cherry picked from commit 738a3999b4)
# Conflicts:
# app/build.gradle