Merge "Add documentation for CaptivePortal APP_RETURN_*" am: 31e3f2e734
am: 72841b4287

Change-Id: I1e14b2d2d5f49980601f2e75eeffc992997de3f5