Turning on Disambiguator for test and test2

Change-Id: Ica483bbd03d7cd6a9672226a65ada01d4aad3a8f
Adding Disambiguator extension to extension list

Bug: 48695
Change-Id: I09aaf91c9d05306988f728eec57fd0feff1ac8ff
Merge changes I09aaf91c,Ica483bbd

* changes:
  Adding Disambiguator extension to extension list
  Turning on Disambiguator for test and test2