Merge "apf: Documentation improvements and code optimizations for keepalive filters" am: f5166d5527
am: 3eb37cda43

Change-Id: I98afa7c17c62c0550bf7f22b311815f6449ad139