fb33bc1cfb
(cherry picked from commit ed1123feb0)
# Conflicts:
# app/build.gradle
(cherry picked from commit ed1123feb0)
# Conflicts:
# app/build.gradle