Merge "Minor Autofill CTS improvements:" into pi-dev