Merge "ExternalAuthException.java-Junits"