2dd2054d4c
(cherry picked from commit 2d03f3ce1e)
# Conflicts:
# app/proguard-rules.pro
(cherry picked from commit 2d03f3ce1e)
# Conflicts:
# app/proguard-rules.pro