Merge "SOFTAP: implement SOFTAP new requirement in framework."