Merge "Changes on Assist structure to handle virtual child for autofill:"