Merge "Separate aware request and peer NDP info"