4d00b2f8ce
(cherry picked from commit 6675508b24)
# Conflicts:
# app/build.gradle
(cherry picked from commit 6675508b24)
# Conflicts:
# app/build.gradle