6959d6c8e8
(cherry picked from commit 3d44feaf2c)
# Conflicts:
# app/build.gradle
(cherry picked from commit 3d44feaf2c)
# Conflicts:
# app/build.gradle