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

Change-Id: I9dea9a5a4013b5935178a49a6106a172c16c3612