(cherry picked from commit 747cbd24cb)
747cbd24cb
(cherry picked from commit 4a3070265a) # Conflicts: # app/proguard-rules.pro
4a3070265a