Merge "Nullcheck to fix Autofill CTS"