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

Change-Id: I035644627b8a794eb64261641be7a3079d559e8d