Merge "Fix testApfFilterKeepaliveAck." am: 60e7162e05 am: d51aec81cb
am: 488f6b0273

Change-Id: I6515e96db11fc1e70bff641e0d98dc7e9301661b