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