ValueError when joining external AD

Change-Id: I0c453c9228590fd67a462c9680b82e1eed08cf0f
Merge "ValueError when joining external AD"