Use the Disambiguator extension if available

Change-Id: I4842eb46bcd17334d5fb063de813558153bdd8f3
Merge "Use the Disambiguator extension if available"