Merge "Deprecate LoginFilter"
am: 254411a902

Change-Id: I1665583a0e8df547df316220937dbda3f09f894a