Merge "Deprecate LoginFilter" am: 254411a902
am: 3eefccbc20

Change-Id: Ib4cc0727aaee1ab07bdc2b38c6d41ced7d06a947