Merge 8c3357cbe43dcc6c3040f95013a8bff13bcfb1e4 on remote branch

Change-Id: I6a96b51363a665ff812a120aaa2ffeb37f840faf
tree: 96572557488378f18c7e9620206cf3da08fb6579
  1. softap/