am "Bug fixes after test run. First pass all OK."

merged from partner/m-wireless-wifi-dev
777f4fc Bug fixes after test run. First pass all OK.
tree: 08629e29e5a1c59c476474b3d836fc9da1f717a8
  1. service/