Merge "Revert "Revert "[Aware] Add paramters in NanConfigRequest to sup...""