(cherry picked from commit ed1123feb0) # Conflicts: # app/build.gradle
ed1123feb0
(cherry picked from commit 73dc51b3f6)
73dc51b3f6