Merge "Properly size response buffer in ifc_act_on_address" am: b407aca123
am: bfa5a805a2

Change-Id: I7f5f01fba611449fcee46f997f331cd0df796620