e8947b3107
(cherry picked from commit ed87dd89a1)
# Conflicts:
# app/build.gradle
(cherry picked from commit ed87dd89a1)
# Conflicts:
# app/build.gradle