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