Completion of Refactoring Email and minSdk to 8