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

Change-Id: Iabbbed0d438137044d689ee0817966afaa51bcae