[automerger] Nullcheck to fix Autofill CTS am: 6c68a692 am: 743abb93 am: a99414f5 am: 6b955039 Change-Id: Ia3658c17dc890ca2de951da5c701e953ce8c969b