f3875bda50
(cherry picked from commit 967df6f7a3)
# Conflicts:
# app/build.gradle
(cherry picked from commit 967df6f7a3)
# Conflicts:
# app/build.gradle