This reverts commit 7e7eb9f39f7b4d3dc8eaf2724030ce6209c989ca. (cherry picked from commit 4857073f303dc0d34dbb688c5b173e2c3fdc35a1) # Conflicts: # app/build.gradle
This reverts commit 7e7eb9f39f7b4d3dc8eaf2724030ce6209c989ca. (cherry picked from commit 4857073f303dc0d34dbb688c5b173e2c3fdc35a1) # Conflicts: # app/build.gradle