(cherry picked from commit ed1123feb0e12aaa270ddf9081a3778dd217c89c) # Conflicts: # app/build.gradle
(cherry picked from commit 73dc51b3f6f68c5888eda990a89eee2bf315ff94)