Merge a49496aea87ff799f76a8e9d694f89a2638b24cc on remote branch

Change-Id: I84692a2ceead1ea746b46cc4c8729d032ca1029c
tree: d87b8f65a7f0140c75be1a20419dfbaf200f107a
  1. softap/