Merge "Memory leak fix in NFA_SetRfDiscoveryDuration()"