Merge d98f57876f99e316ac64edea6aaed86426d4b913 on remote branch

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