Merge 650d036038bafdba3cde1472961edde6dcc16225 on remote branch

Change-Id: I622541a7fac02a2db2d869da97a513b062955b4a
tree: 4a25a229ef250506dbc6d50ca5d4f4446446e164
  1. softap/