Added/Updated common files for Non Google user login which will not impact existing functionality