Merge 59c014ff953852d615b8a78f27ddfa6e793964d7 on remote branch

Change-Id: I7cd3744295ec99bf296247b73561d3d42b369394
tree: e78673d9c2882b24dfd32d098c7ea24a3422b0a2
  1. softap/