Resolve conflicts with dev branch
Resolve conflicts with dev branch

AzureAD/microsoft-authentication-library-for-objc,AzureAD/microsoft-authentication-library-for-objc,AzureAD/microsoft-authentication-library-for-objc,AzureAD/microsoft-authentication-library-for-objc,AzureAD/microsoft-authentication-library-for-objc