Merge "Deprecate LoginFilter" am: 254411a902 am: 755f6ae1a3

Change-Id: I995410bc4e2f56cfad092435eb34a570b58261b7