Merge "Restructuring Autofill cts - commontests"