Snap for 7550930 from b3149b133c5c227f29258e67756be949afa319c8 to mainline-captiveportallogin-release

Change-Id: Idc35bf42f709d27f321ec21354308fab3e5d190e