Merge "Apf: Avoid constant overflow" am: 5b99659943
am: 4afe1f957b

Change-Id: Id2e62fe7d34d88633ae9cd4c9a01c6a5a1eed838