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

Change-Id: I150ff9f6ede5f9165db596b81fc3ee0a60838eef