Merge "Memory leak fix in NFA_SetRfDiscoveryDuration()" am: cb388ef835 am: 321268ad22
am: d0050e3b37

Change-Id: Id0f32c0b38703592a12b28aaece5b7c87fe7dc4b