Merge 04a6a9712effe6c6e4cf84e4062c1d50f15aa506 on remote branch

Change-Id: Icb0d8a1efb21abd2c03a539c8c2af5a2da39f4f6
tree: 7290f1548893dbc864caa1ecfbb2ebfa205e660f
  1. softap/