Adding Disambiguator extension to default.conf

Bug: 48695
Change-Id: I41b5b96d3f1c8a1e28c06c3a659d65a7fa5983c8