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